Another commit

Cleaned up a bit and worked more on the Templates section