finished order & fixed some templates