Added some ui changes
Courtesy sreevisakh