fixed some ie errors
fixed conflicts
pulling alex branch
started the settings header
settings dropdown looking a bit better than before
pushing for dave
merging with richy
Merged with rich and alex and added the edits to the templates so they will now actually work