Major UI fixes