Workaround for carriage returns and new lines

Snips carriage returns and new lines from admin template. Does not fix
the issue so much as work around it. Likely to bring its own issues.

Cleanup of some files, added comments.