Initial pass of making UI clearer...