1. Changes in navbar 2. Changes in the registration added new field
 merge changes