Move all static content into templates so we can better organize things - and we can load only the markup we require.  Still pretty rough, but a good start.