Add simplified error handling
Make instructions scale better on various layouts