Some more template updates.  Will be working on page layout and styling of modal next.