Making the icons consistent
Tweaks to appearance
Better order of elsewheres...
Getting rid of unnessary stuff from the template