Modified layout to match initlzr