work on views, and formatting