Part of cleaning up redundant templates
Get rid of unneeded template
Various improvements to the UI, the main things being : make everything bigger; use some colours other than black and white