fixing ui bugs