Huge overhaul
Minor graphical changes
Added last changes
Merge branch 'master' into gh-pages