Cleaned up ui