Separates layout components and fixes Modernizr task (unused for now)