UI improvements LAST MINUTE COMMIT LOL