Error handling + layout adjusments