UI Fixes

Also some organization and commenting, much more to come...