some minor fixes in big screen behaviour. State is preserved.