Merge "Fix issues with taps and file saving, update UI"