Combined block models & views and modified controllers