UI review fixes.