Aspire implemented picker; need to implement new main view
Merge remote-tracking branch 'origin/master'