1.3 Major Code Clean up

Removed all inline styling
Removed unneeded tags
General cleanup