Add twitter. Rearrange links