Layout changes, remove logging for now.