initial plus btn functionality
Merge branch 'develop' into add-plus-btn-functionality
fix problems
Merge branch 'add-plus-btn-functionality' into develop