refactor menu views to make more consistent