fixing layout issues after switching to beta 20