modal and tabs minor fixes