Minor Core update 7.20. Minor layout updates