Fix some space problems
Add tag plugin and update template