Fixed scroll view
Merge remote-tracking branch 'origin/master'
random buttery + deselect row + changed constands
Merge remote-tracking branch 'origin/master'