Made nice menu and implemented more consistent templating