Fix - Custom navbar