Manoj

Merged v0.9.2 tested on aakash, works properly, missing icons issue remain to be sorted out by pps