a bit more clean-up and making the secondary menu look a bit better