Cleanup
Improved marking tools
Clean up pages, placeholder content