fixed modal and stylings
commit merge