Better command layout.