Changed view logic a bit.