Add error handling and style