Texts changed, minor improvements to design