Added some stuff for the layouts.