added navbar for mobile
complete merge