Feature user interface

Pretty much done on the core controls now.

Committing into dev branch before starting on Feature_Rendering