Added frontpage
fixed merge errors