views and forms adjusted