Add close button and set fixed width for avatar