changed UI to follow design document