Fixed updating logic for live view
A couple small fixes
Fixed live view