Completed UI

Vastly reduced line count, buttons added.