refactoring forms directory structure and adding collapse to forms in the nav