More git merges

Moved responsive stuff to inline