Changed some things, still working on text-decoration issues