Layout plans for future fixes