major layout re-factoring