Final Version

Merging the two layouts and the auto-load from scrolling functionalities.