Style and menu refactoring