cleanup menu a little
cleanup styles
cleanup style, layout