Bug fixes and began work on grid layout.