#1 | fixes in the view