Small fixes, menu cleanup, visual improvements