Polish design
Add checkbox to keep opening
Merge branch 'develop'