Header - Introduce Content Modularisation
Clean up SQL