Added a menu on the action bar and improved layout of settings.