Bug fixes
Fixed few things and updated navbar