Initial Ingrid 2.0 commit, with new class-naming convetions and media queries