[IMP] improved menu, margins, UI