Fixed Menu stuff and Minor Bugs

lol