restored main controller
fixed masonry grids
refactoring