updated scaffold layout