Changes to layout #14