Updated to add different layouts