Second layout commit; problem w/shell on last commit