"Now using nice layout"
refactored r-spec
Finish layouts