Fixing bugs with the new layout.