Menu 'main' link fix
Several cosmetic changes + user add fix