ui bugs fixing