fix layout and make set user