Updated to new one-page layout. Blog not yet implemented
merged new design into master