ui bug quirk fixes