Cleaned Templates
Added new templates