Added comments and removed actionbar functionality