FINALLY FIXED UI BUGS FOR REAL