reorged views for sanity