Cleaned the action bar and fixed minor bugs