HUD renaming

and first parts for view/control separation