Updated configs and progress on initial layout