major layout changes