working on catalog page
merge conflict fixes
homepage changes