fix grunt css tasks, cleanup master layout