layout changes, still need to fix header bar