Added some demo views, changed a lot of directives for masonry, etc