Cleanup

HTML cleanup
Use constant instead of variable
TOS design