refactored menu. fixed bugs. yay.