fixed site errors and changed the styles
Merge remote-tracking branch 'origin/master'