Slight improvements to state handling in web app tab