InMemory Database for Scrolls
Buttons close to each other in layout
Merge remote-tracking branch 'origin/master'