halfway on the extended view
fixed merge conflicts with maseter
Merge pull request #5 from ColorTurtle/modal

Modal