Optimizations and slight updates to HTML includes.