Fixed Layout and Scrolling Problem

Fixed that pesky scrolling problem and some adjustments to the layout
on desktop devices.