fixed loading, tightened up layouts