Restructure of menu/css