Minor reformatting and create areas template