Added check on action bar buttons. Fixes #15.
+Clean up