fixing variables being escaped when put into DB
layout changes