Refactor menu items + whitespace cleanup