Changes layout to fluid
Changes ENV to be more concise, and match Grader