BugFix checkboxes
updated view
Renamed
Merge branch 'develop'