added mobile navbar
fixed merge conflicts