Modern UI fixes