secret keys added
conflict resolved
most of styling is done, comments and navbar search are fixed