fixed a lot indentations, further escaping and code improvements
newline
Merge pull request #66 from nextgenthemes/master

Indentation, escaping, code improvements