Fixed/Removed a lot of the hacky code I committed earlier for selecting things in the menu