Add component view scrolling
Start adding component selection
Merge remote-tracking branch 'origin/exp' into exp