added spans

Starting to change the layout of certain things so that they look nicer
i.ee the & etc