Tests passing with redesign
Improved layout slightly to match grid