More Template/code changes. Everything looks and works prettier.