improved template look a bit