Add warning message / Right column feature and update few texts