Changes to frontpage
solved conflict