UI cleanup and preparation for  #2