cleaned up ui