[#244] Fixes #244 by updating/rearranging text