changed layout, added name for users