Fix conflict issue, adding styling to home and index pages, refracted code