new views and some controller modifications