Changed menu structure and notifications styling
Merge conflict fix
commit