major rework of support functions - made views way cleaner