Some views and controller modifications.