Changed the menu so that now all the components are just in the menu,
rather than into a nested menu.

This made sense as 98% of the time I was going into this nested menu,
which was a waste of time.

Right now the unit tests are broken, expect them to be fixed later.