reorganized flow, added quiz button in action bar