Progress on views and controllers