Updated lay-out and text, and some minor bug fixes