fixed a bunch of menu layouts and logic