Added carrierwave, style changes