Fix UI layout issues