major layout update and tweaks suggest by teammate