changes as per Erick's mail.

Changes done as per Erick's mail. Few things are remaining.
few more changes to the overall views-flow
Merge branch 'webapp_apr14' into python