Changes needed to first iteration layout changes at developLiveScriptor branch 13f3c0f2b15fcacf87883d74239a48acae821cfd