cleanup and menu styling