fixed conflicting selectors
minor fixes
fixed masonry bugs and aded masonry filtering
done mockup and masonry functionality
added files after conflict