Version as of 040413 1941

Changed to grid layout, fixed previous questions.