Refactor menu style a little