Replaced textViews with labels
Changed commit message