added forms
before merge
navbar changes