Interface cleanup

Just cherry picking some of the easiest 0.1 milestones while I wait for another program to finish :)