UI Changes as per observations