UI correction after testing