main page styling started
merge conflict fixed