Tweak menu layout

This PR is for tweaking menu appearance, which need to be cleaned because of new content, part of issue #4