Layout improvements

Use user_name