Made template look better