Major Changes to UI, Still Incomplete

Pushing set of changes, please review how it is being done, and let me
know if there are any comments. It doesn't work yet but getting close.