Cleaned up UI a bit