Some fixes on devise layout