Change few things about UI