fix layout and add devisable user