#202 Restructure front-end menu