Slight refactoring.  Changed SW views and associated templates, made fonts in base.html a tag, tweaked naming in menu models