Merge branch 'master' into prakhar
Major UI changes.
Merge branch 'prakhar'