View state tweaks