couple random UI clean ups