More UI Code

UI code is more enhanced with new functionality