scss tweaks and minor templates updates
fixing merges