cleaned up some markup and styled up it a bit more