better ember layout
lots of learning
resolved conflicts