1st adjustements (lots of) to new layout