Ui Fixes

Signed-off-by: Dileep Mishra <Dileep.Mishra@kony.com>
Merge branch 'dev_final' of https://github.com/mishradileep-yahoo/schoolknot into dev_final