minor cleanup, add layout back in