minor changes to layout and to !name