Text changes, bug fixes and small design improvement.