Fixed layouts, changed forms for devise