add home page
fixed merge issues and duplicates