Remove last margin changes and adjust the top bar z-index instead.