Major cleanup. Incl: grid and styles