upgrade to 3.1.1, fixed modal, clean css, cleanup