Enhanced the positioning of some elements