Mainactivity edits