some final design touches and tied templates to real values