Refactoring and 'Tasks' added to every menu