Added a few more minor adjustments layout/navbar