Introducing Layout and fixing env