Fixed Template Naming and added new Fancy Box