Small improvements

Why remove the reference to ImageView? We need to hide it and show it sometimes (we're not doing so, but will in the future for UX improvements)