Superficial changes to UI, first pass