Removed username attributes from user and changed layout