adjust views and fix models