More styling and error handling