Menu
Update menu
Merge branch 'menu' into ruben
Fix menu active item
Frontend work
Update frontend
Update frontend
Merge branch 'ruben' into develop