Temp

This branch has UI changes only. No conflicts. Changes are mainly made in manageConetxt.jps