Made some changes on UI