Fixing some issues in the main state menu, adding some other stuff.