Updated content views & bug with close button