linked navbar and bottom bar pages
resolve merge conflicts