Fixes on the navbar
Format finish
Add more rows
Fix table of context