initial stab at cleaning up interface a bit

I don't like idea of putting everything in an anchor tag, so all of that will probably change.