Grid system refactor. Removed image toggle.