Edited layout and text to (hopefully) improve usability