lot of modification in UI