Enhancements to layouts and icons. Thanks Ken.