front page working and updated stlying
fixed merge conflicts