Retooled UI a little