reorganized templates directory; corrected several styling issues