Buggy ui fixed