CSS cleanup and some UI tuning