Updates to menu code, minor bugfixes, sass refactoring