Still fixing ui bugs