added layout prework