Positioning Improved

Fixed positioning which slightly improves performange.