Modify latest layout - more consistency
Merge branch 'develop' of https://github.com/Trrnts/Trrnts into layout
Implement inifnite scrolling
Merge branch 'layout' into develop