New click handling code in main activity plus layout changes.
Merged origin/master into master.