Fixed views & moved the API methods around