several layout improvemets + code cleanup + first attempt to implement settle_all