updated wrapper styling
resolved conflicts