Sorted out some of the responsive stuff