merge fixes UI files from Activity branch