UI fixes, I think i fixed some code or something too