Cleaned up ui.