Update with master version

* Added modals
* Refactoring