major layout changes almost done