made changes based on UI requirements

made changes based on UI requirements