Fixed gulp watch
Minor style changes
Separated menu content from logic