Code reorganization, add button in action bar hides when task being added or modified