Renamed template
Small tweaks
Updated changelog