Refactored ActionBar and click handling
merge fix