adding neat grid
adding neat grid
fixed merge conflicts
fixed nav bar logo
nav bar with dashboard links with neat
neat added to nav bar