Layout changes
Add some basic fallbacks for handling API errors