reorganize, add an elif not error to view template
reorganize moar
various tweaks and display improvements