Strip down UI a bit more, in preps for future redesign