Finishing first pass on responsive layout