Added action bar and started to clean up MainActivity