re worked templates
aligins with other branch
messing with ranges on page