improvements to library and default layout