Changed menu styling & structure