edited the front page layout
fixed merge