Updated modal view code