Remove obsolete classes, tweak forms and subnavs