cleanup template and add some styling