Fixed scroll/alignment issue