added background color and border to Show Me button
fixing merger problems in ConversionVC