Fixed layout bug in undrafting, reading draft bug