Changing layout from Menu to Scroll

Plus a bunch of other changes