Cleaned up UI some more