Error checking and navbar tweaks