some indention and switching to templates for viewomatic (not fully functional yet...