Cleaned up UI a little