Worked on menu layouts a bit