Small updates before responsive changes