cleaned up UI a little