Horizontal scroll fix & features set-up

* fixed margins