More shortcuts text, and better layout