Updated Layouts for v0.3  #17