major layout updates