Layout update.
Merge remote-tracking branch 'refs/remotes/origin/master'
UI fix: native scroll instead of iScroll.