Updated the base template a bit.