#53 Few view changes