My first design, updated with your feedback! More to fix?