More using of macros -- to ensure fully on-screen