simplify menu and improve styling