Added comments and few changes in UI