- menu, view and code cleanup