several changes to layout