clean up
added menu to the layout