Moved templates to be in line with suggested best practices
fixed standard panel class