cleaned up UI more