few more changes to the overall views-flow