[PROJXP] More changes to the new layout ideas...