Clean up ui slightly