Some changes in layout, some new models and carrierwave to S3