Styling and error handling changes