started menu layout
jro merge conflicts