Added devise and fixed layout a bit