Added missing views, fixed sync bug