Fixed get weird behaviour + updated view