Merging old SVN, finished front page