Updated construct and css