Added secondary menu and cleaned up content naming conventions