Fix UI misplacements