fix code structure issues and increase bottom margin of app name
tweak margins and padding for main nav