Should fix multiple bugs

Scrolling and Margins