Address a few issues to make customizing the template easier

Address issue #6