template clean up, look and feel