Reorganizations in DB View (now there is time to continue chart dev)