fixed the UI hacks I added