changes to home page and others
fixed merge conflicts on home page