Design changes to modal 37

This Pull Request intends to close #37 .