Somewhat fix UI... sigh...