Final fixes to startup template