Add error handeling and styling