uncommited changes in layout,strings, and Feedback activitty