Cleaning House, and changing buttons to TextViews