Rebase against foundation css framework