Some refactoring with attempt to plug angular with masonry as our home page solution, contribs t0 #105 and #128