Major updates to views to get the dynamic includes and extends owrking