UI fixes

Russia here we are