Further edits to Templateing to make it look nice