fix ui bugs
Stuff