UI: Menu Updates, Theme cleanups