layout fix, new templates, active states