Moved modal and navbar overrides to their own partials