Reorganise components and add a 'clear-aspect-ratio' mixin